Tue Jan 18 13:46:46 2005 Manish Singh <yosh@gimp.org

        * gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids):
        disambiguate nested if/else.

diff --git a/ChangeLog b/ChangeLog
index 73e02739d2c1a3ee2edfa47fa51fecaf8549a988..35b0d307a89fcdeb0e025383af76e3ac9890085a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 18 13:46:46 2005  Manish Singh  <yosh@gimp.org
+
+       * gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids):
+       disambiguate nested if/else.
+
 2005-01-18  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-6:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 73e02739d2c1a3ee2edfa47fa51fecaf8549a988..35b0d307a89fcdeb0e025383af76e3ac9890085a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Jan 18 13:46:46 2005  Manish Singh  <yosh@gimp.org
+
+       * gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids):
+       disambiguate nested if/else.
+
 2005-01-18  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-6:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 73e02739d2c1a3ee2edfa47fa51fecaf8549a988..35b0d307a89fcdeb0e025383af76e3ac9890085a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Jan 18 13:46:46 2005  Manish Singh  <yosh@gimp.org
+
+       * gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids):
+       disambiguate nested if/else.
+
 2005-01-18  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-6:

diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index 72dfb3559266e7d29d892b4b852a205b629eabe4..c6f3142072a2774932286e53afe91ecf23fea691 100644 (file)
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -328,25 +328,27 @@ _gdk_x11_have_render_with_trapezoids (GdkDisplay *display)
   GdkDisplayX11 *x11display = GDK_DISPLAY_X11 (display);
 
   if (x11display->have_render_with_trapezoids == GDK_UNKNOWN)
-    if (!_gdk_x11_have_render (display))
-      x11display->have_render_with_trapezoids = GDK_NO;
-    else
-      {
-       /*
-        * Require protocol >= 0.4 for CompositeTrapezoids support.
-        */
-       int major_version, minor_version;
+    {
+      if (!_gdk_x11_have_render (display))
+       x11display->have_render_with_trapezoids = GDK_NO;
+      else
+       {
+         /*
+          * Require protocol >= 0.4 for CompositeTrapezoids support.
+          */
+         int major_version, minor_version;
        
 #define XRENDER_TETRAPEZOIDS_MAJOR 0
 #define XRENDER_TETRAPEZOIDS_MINOR 4
        
-       if (XRenderQueryVersion (xdisplay, &major_version,
-                                &minor_version))
-         if ((major_version < XRENDER_TETRAPEZOIDS_MAJOR) ||
-             ((major_version == XRENDER_TETRAPEZOIDS_MAJOR) &&
-                (minor_version < XRENDER_TETRAPEZOIDS_MINOR)))
-           x11display->have_render_with_trapezoids = GDK_NO;
-      }
+         if (XRenderQueryVersion (xdisplay, &major_version,
+                                  &minor_version))
+           if ((major_version < XRENDER_TETRAPEZOIDS_MAJOR) ||
+               ((major_version == XRENDER_TETRAPEZOIDS_MAJOR) &&
+                  (minor_version < XRENDER_TETRAPEZOIDS_MINOR)))
+             x11display->have_render_with_trapezoids = GDK_NO;
+       }
+    }
 
   return x11display->have_render_with_trapezoids == GDK_YES;
 }